From af30268ed73397d24acaee83477ff555a43df5e4 Mon Sep 17 00:00:00 2001 From: Elliott Mitchell Date: Thu, 16 Jul 2020 19:07:31 -0700 Subject: [PATCH] debian/rules: Combine shared Make args The original author of debian/rules seemed to have planned to make use of $(make_args_common), but never got to sharing combined values. Since some values are shareable, make use of the shared args. Signed-off-by: Elliott Mitchell Reviewed-by: Ian Jackson --- debian/rules | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/rules b/debian/rules index 0d902c9ff8..4cac51d0b0 100755 --- a/debian/rules +++ b/debian/rules @@ -134,15 +134,15 @@ dpkg_CFLAGS := $(shell $(dbmo) dpkg-buildflags --get CFLAGS) dpkg_CPPFLAGS := $(shell $(dbmo) dpkg-buildflags --get CPPFLAGS) dpkg_LDFLAGS := $(shell $(dbmo) dpkg-buildflags --get LDFLAGS) -make_args_xen= $(make_args_common) \ +make_args_common := \ XEN_COMPILE_ARCH=$(xen_arch_$(DEB_BUILD_ARCH)) \ - XEN_TARGET_ARCH=$(xen_arch_$(flavour)) \ + XEN_TARGET_ARCH=$(xen_arch_$(flavour)) + +make_args_xen := $(make_args_common) # (Xen upstream does not offer a separate CPPFLAGS, # so we pass those in CFLAGS.) -make_args_tools= $(make_args_common) \ - XEN_COMPILE_ARCH=$(xen_arch_$(DEB_BUILD_ARCH)) \ - XEN_TARGET_ARCH=$(xen_arch_$(DEB_HOST_ARCH)) \ +make_args_tools := $(make_args_common) \ EXTRA_CFLAGS_XEN_TOOLS='$(dpkg_CFLAGS) $(dpkg_CPPFLAGS)' \ PREPEND_LDFLAGS_XEN_TOOLS='$(dpkg_LDFLAGS)' -- 2.30.2